Allows adding annotations programmatically.
Fix a method that checks if a query has value.
Add necessary separator check.
Fix some query generation bugs.
Add some unit tests