fix Makefile
Updated template, added search