createQuery method implemented, reworked save notification and changed demo accordingly