Filter of resultsets, other fixes