Fixed ids with spaces issue for now with different selector syntax