Aquabrowser refinements