Changed validation on entries and added search features