Re-merged location logical with fixed js/markup