restrict all queries to the relevant file

clean up 4 queries which were matching across the entire e-r index
and instead restrict them to the files where they results were
actually found. This will hopefully adjust the load on the ES
cluster.

Change-Id: Ic999039d5f896f632987fcb87f3a3469596972ed