Fix naming descrepency, correct null arg placement
Fix merge conflict

Conflicts:
	source/request_lastfm_top_albums.js