Added filtering to all fetch methods