Various js improvements
Restore behavior on non-matched images