Add support for undefined options
Fix bug with between operator