Implemented result highlighting in paging
Fixed bug in file paging (SQUASHME into 8413d9)