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
It's a point for a personal discussion, but this is one place where I would not have used a type alias. It's not wrong -- I just personally feel that it makes it less clear rather than more clear. But I can see it both ways, so...shrug.