adding a proper search function for simple searches with an or on states and with an eval vunction allowing regular expression searches.