@Marcel ****
there is no 30 day visa on arrival from a border hope, IF got stamped in for 30 days from bouncing out and back you came in on a 30 day visa exempt entry,
Which means you need to have your employer get ahold of the immigration office because you should be able to apply for an in country Non-imm visa from this 30 day embassy request extension as long as when you go back to get the extension inked in (after the under consideration stamp) you still have at least 15 days left on the extension