Preserve old behaviour, handle 1 word SQL