More improvement to PROOF setup
Moving selection definitions in inputs/