Implemented a more general version of concept querying to allow easy modification.
Merge remote-tracking branch 'origin/workingMap' into workingMap