Reworked searching and parsing