Added filtering to analysis