Working on search. Updated Jinja templating too