Bug fixes for new quarter filter handling