Changed zoom behaviour and cluster feature