search terms for ex5 are now case insensitive

and some refactors for prettification