Make grammar a bit more strict
Remove some redundant tests
Be more flexible with URL to allow vars