Evaluation forms filtering & tweaks