Fixed api tests (SQUASHME into 45773f)
Implemented result highlighting in paging
Fixed bug in file paging (SQUASHME into 8413d9)
Decoded filter query
Added additional reverse lookup data to several views
Changed swid tag import to allow entity name update