Fix filepath
Fix search
WIP