Fix query criteria to include financial type etc against time periods