Refactored search - no more wild cards #40