diff --git a/include/boost/geometry/extensions/index/filters/nearest_filter.hpp b/include/boost/geometry/extensions/index/adaptors/nearest_query.hpp
similarity index 91%
rename from include/boost/geometry/extensions/index/filters/nearest_filter.hpp
rename to include/boost/geometry/extensions/index/adaptors/nearest_query.hpp
index 8e1ecb1f1..f9c6a046f 100644
--- a/include/boost/geometry/extensions/index/filters/nearest_filter.hpp
+++ b/include/boost/geometry/extensions/index/adaptors/nearest_query.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry Index
 //
-// Nearest neighbour filter implementation
+// Nearest neighbour query range adaptor
 //
 // Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland.
 //
@@ -8,8 +8,8 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_FILTERS_NEAREST_FILTER_HPP
-#define BOOST_GEOMETRY_EXTENSIONS_INDEX_FILTERS_NEAREST_FILTER_HPP
+#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_ADAPTORS_NEAREST_QUERY_HPP
+#define BOOST_GEOMETRY_EXTENSIONS_INDEX_ADAPTORS_NEAREST_QUERY_HPP
 
 namespace boost { namespace geometry { namespace index {
 
@@ -98,4 +98,4 @@ operator|(
 
 }}} // namespace boost::geometry::index
 
-#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_FILTERS_NEAREST_FILTER_HPP
+#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_ADAPTORS_NEAREST_QUERY_HPP
diff --git a/include/boost/geometry/extensions/index/filters/query_filter.hpp b/include/boost/geometry/extensions/index/adaptors/spatial_query.hpp
similarity index 88%
rename from include/boost/geometry/extensions/index/filters/query_filter.hpp
rename to include/boost/geometry/extensions/index/adaptors/spatial_query.hpp
index 4d30b4ea9..8b9d12262 100644
--- a/include/boost/geometry/extensions/index/filters/query_filter.hpp
+++ b/include/boost/geometry/extensions/index/adaptors/spatial_query.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry Index
 //
-// Query filter implementation
+// Spatial query range adaptor
 //
 // Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland.
 //
@@ -8,8 +8,8 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_FILTERS_QUERY_FILTER_HPP
-#define BOOST_GEOMETRY_EXTENSIONS_INDEX_FILTERS_QUERY_FILTER_HPP
+#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_ADAPTORS_SPATIAL_QUERY_HPP
+#define BOOST_GEOMETRY_EXTENSIONS_INDEX_ADAPTORS_SPATIAL_QUERY_HPP
 
 namespace boost { namespace geometry { namespace index {
 
@@ -74,4 +74,4 @@ operator|(
 
 }}} // namespace boost::geometry::index
 
-#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_FILTERS_QUERY_FILTER_HPP
+#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_ADAPTORS_SPATIAL_QUERY_HPP
diff --git a/include/boost/geometry/extensions/index/pushable_array.hpp b/include/boost/geometry/extensions/index/pushable_array.hpp
index 68b69dd00..14570afdf 100644
--- a/include/boost/geometry/extensions/index/pushable_array.hpp
+++ b/include/boost/geometry/extensions/index/pushable_array.hpp
@@ -151,7 +151,8 @@ public:
     inline void push_back(Element const& v)
     {
         BOOST_GEOMETRY_INDEX_ASSERT(m_size < Capacity, "can't further increase the size of the container");
-        m_array[m_size++] = v;
+        m_array[m_size] = v;
+        ++m_size;
     }
 
     inline void pop_back()
diff --git a/include/boost/geometry/extensions/index/rtree/filters.hpp b/include/boost/geometry/extensions/index/rtree/adaptors.hpp
similarity index 87%
rename from include/boost/geometry/extensions/index/rtree/filters.hpp
rename to include/boost/geometry/extensions/index/rtree/adaptors.hpp
index 44f56dd2f..85b14d670 100644
--- a/include/boost/geometry/extensions/index/rtree/filters.hpp
+++ b/include/boost/geometry/extensions/index/rtree/adaptors.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry Index
 //
-// R-tree queries filters implementation
+// R-tree queries range adaptors
 //
 // Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland.
 //
@@ -8,14 +8,14 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_FILTERS_HPP
-#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_FILTERS_HPP
+#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_ADAPTORS_HPP
+#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_ADAPTORS_HPP
 
 #include <deque>
 #include <boost/static_assert.hpp>
 
-#include <boost/geometry/extensions/index/filters/query_filter.hpp>
-#include <boost/geometry/extensions/index/filters/nearest_filter.hpp>
+#include <boost/geometry/extensions/index/adaptors/spatial_query.hpp>
+#include <boost/geometry/extensions/index/adaptors/nearest_query.hpp>
 
 namespace boost { namespace geometry { namespace index {
 
@@ -82,4 +82,4 @@ private:
 
 }}} // namespace boost::geometry::index
 
-#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_FILTERS_HPP
+#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_ADAPTORS_HPP
diff --git a/include/boost/geometry/extensions/index/rtree/rtree.hpp b/include/boost/geometry/extensions/index/rtree/rtree.hpp
index b8a93e95c..8020cdaf5 100644
--- a/include/boost/geometry/extensions/index/rtree/rtree.hpp
+++ b/include/boost/geometry/extensions/index/rtree/rtree.hpp
@@ -26,7 +26,7 @@
 #include <boost/geometry/extensions/index/rtree/options.hpp>
 
 #include <boost/geometry/extensions/index/predicates.hpp>
-#include <boost/geometry/extensions/index/rtree/filters.hpp>
+#include <boost/geometry/extensions/index/rtree/adaptors.hpp>
 
 #include <boost/geometry/extensions/index/rtree/node/node.hpp>