fix query issues and adapt styles to new mappress system