Adding query and bootstrap