Fix the filtering to do the follwing:

- when in English only show English documents
- when in non-English mode show both language documents as well as English
Reverted some previously removed parts of the result template to better work with the new search method.