This is extremely ugly, but this solves the empty string problem... for now
Removed the ugly!

Now to solve the completion problem...
Merge branch 'feature/empty-string' into develop