diff --git a/src/ui/audio/desktop/TableFilter.cpp b/src/ui/audio/desktop/TableFilter.cpp
index bedb27ab..6af45e97 100644
--- a/src/ui/audio/desktop/TableFilter.cpp
+++ b/src/ui/audio/desktop/TableFilter.cpp
@@ -17,6 +17,7 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <Wt/WConfig.h>
 #include <Wt/WItemDelegate>
 
 #include "database/Types.hpp"
@@ -86,7 +87,9 @@ TableFilterCluster::layoutSizeChanged (int width, int height)
 void
 TableFilterCluster::refresh(SearchFilter& filter)
 {
+#if WT_VERSION >= 0X03030500
 	this->clearSelection();
+#endif
 
 	Cluster::updateUIQueryModel(DboSession(), _queryModel, filter);
 }
@@ -165,7 +168,9 @@ TableFilterArtist::layoutSizeChanged (int width, int height)
 void
 TableFilterArtist::refresh(SearchFilter& filter)
 {
+#if WT_VERSION >= 0X03030500
 	this->clearSelection();
+#endif
 	Artist::updateUIQueryModel(DboSession(), _queryModel, filter);
 }
 
@@ -249,7 +254,9 @@ TableFilterRelease::layoutSizeChanged (int width, int height)
 void
 TableFilterRelease::refresh(SearchFilter& filter)
 {
+#if WT_VERSION >= 0X03030500
 	this->clearSelection();
+#endif
 	Release::updateUIQueryModel(DboSession(), _queryModel, filter);
 }
 
diff --git a/src/ui/audio/desktop/TrackView.cpp b/src/ui/audio/desktop/TrackView.cpp
index 8695d858..aaec7939 100644
--- a/src/ui/audio/desktop/TrackView.cpp
+++ b/src/ui/audio/desktop/TrackView.cpp
@@ -19,6 +19,7 @@
 
 #include <boost/date_time.hpp>
 
+#include <Wt/WConfig.h>
 #include <Wt/WItemDelegate>
 #include <Wt/WBreak>
 
@@ -160,7 +161,9 @@ TrackView::emitStats(const SearchFilter& filter)
 void
 TrackView::refresh(SearchFilter& filter)
 {
+#if WT_VERSION >= 0X03030500
 	this->clearSelection();
+#endif
 	Track::updateUIQueryModel(DboSession(), _queryModel, filter);
 
 	emitStats(filter);
diff --git a/src/ui/common/InputRange.cpp b/src/ui/common/InputRange.cpp
index 3ff0da7b..cb1ce054 100644
--- a/src/ui/common/InputRange.cpp
+++ b/src/ui/common/InputRange.cpp
@@ -21,29 +21,36 @@
 
 #if WT_VERSION < 0X03030500
 #include <Wt/WTemplate>
+#include <Wt/WText>
 #endif
 
 #include "InputRange.hpp"
 
+#if WT_VERSION >= 0X03030500
 InputRange::InputRange(Wt::WContainerWidget *parent)
 : Wt::WWebWidget(parent)
 {
-	//TODO woraround for older Wt versions
-#if WT_VERSION >= 0X03030500
 	setHtmlTagName("input");
 	setAttributeValue("type", "range");
-#else
-	Wt::WTemplate *t = new Wt::WTemplate("<input type=\"range\"></input>", parent);
-#endif
 }
 
-
 std::string
 InputRange::jsRef(void) const
 {
-#if WT_VERSION >= 0X03030500
 	return Wt::WWebWidget::jsRef();
-#else
-	return this->jsRef() + ".getElementsByTagName(\"input\")[0]";
-#endif
 }
+
+#else
+InputRange::InputRange(Wt::WContainerWidget *parent)
+: Wt::WContainerWidget(parent)
+{
+	addWidget(new Wt::WTemplate("<input type=\"range\"></input>"));
+}
+
+std::string
+InputRange::jsRef(void) const
+{
+	return Wt::WWebWidget::jsRef() + ".getElementsByTagName(\"input\")[0]";
+}
+#endif
+
diff --git a/src/ui/common/InputRange.hpp b/src/ui/common/InputRange.hpp
index 7f03abb4..9ccb8fa8 100644
--- a/src/ui/common/InputRange.hpp
+++ b/src/ui/common/InputRange.hpp
@@ -22,11 +22,12 @@
 #include <Wt/WContainerWidget>
 #include <Wt/WWebWidget>
 
+#include <Wt/WConfig.h>
+#if WT_VERSION >= 0X03030500
 class InputRange : public Wt::WWebWidget
 {
 	public:
 	InputRange(Wt::WContainerWidget *parent = 0);
-
 	Wt::DomElementType domElementType() const
 	{
 		return Wt::DomElement_INPUT;
@@ -35,3 +36,16 @@ class InputRange : public Wt::WWebWidget
 	std::string jsRef() const;
 };
 
+#else
+
+class InputRange : public Wt::WContainerWidget
+{
+	public:
+	InputRange(Wt::WContainerWidget *parent = 0);
+
+	std::string jsRef() const;
+};
+
+#endif
+
+