Fixed LAS-132, attachement type query param and small issues