Enhance resources search
More natural map modes