Wip/fix search