Addresses issue #3 doesn't completely fix it, but should have better detection on user going from one search screen to another.