Updated views and query section