Add dummy search_logic implemetation
Add first simple mapping
Fix indexing