#15 Add search
#15 Remove prefixed properties
#15 Search form