fixed merge conflict
functional search
added shortcuts 1-4 hard coded