* Added subqury filtering
* whitespace cleanup