add support for shortcut syntax of $and