diff --git a/maloja/malojauri.py b/maloja/malojauri.py
index e94d46a..b2637f3 100644
--- a/maloja/malojauri.py
+++ b/maloja/malojauri.py
@@ -81,7 +81,8 @@ def uri_to_internal(keys,accepted_entities=('artist','track','album'),forceTrack
 	#if "remote" in keys: specialkeys["remote"] = keys["remote"]
 	specialkeys["separate"] = (keys.get('separate','no').lower() == 'yes')
 	for k in keys:
-		if k not in ['separate']:
+		if k in ['remote','b64']:
+			# TODO: better solution!
 			specialkeys[k] = keys[k]