Jhbate/filter returned data

@kentquirk @jebeck not quite how I wanted to do it but still does the trick. Also ensured we are using an index - I added this to the message-api also and it seems to help