Added sanitise regex, highlighting, and + or searches