added missing files in previous changeset

added support for selecting up to ten nodes from single query
improved boolean expressions macro to handle comparison against properties and variables