Replace fuzzy searching for subjects and clean up some code by using sel...

...ect *