search and apply pages fixes