Added filter stubs and result count