Fixes for audit and evaluation pages