More efficient PGN search and remove another default scope