Remove prepending '@' on insert. Not the best solution for multiple flags, will revisit