criteria form format fixes