Modified query in the artifact model, edited some of the js