resolve now handles complex queries - need to join
Fixed IndexOutOfBounds in Space collection method
Implemented PLUS regex handling in ResolutionEngine