Added filtering on all entry pages