Remove album/track search. Add submission function