diff --git a/app/views/calendars/show.html.erb b/app/views/calendars/show.html.erb
index 7b5abd77..4541cc0c 100644
--- a/app/views/calendars/show.html.erb
+++ b/app/views/calendars/show.html.erb
@@ -20,7 +20,9 @@
 </p>
 
 <p class="buttons">
+<%= label_tag('month', l(:label_month)) %>
 <%= select_month(@month, :prefix => "month", :discard_type => true) %>
+<%= label_tag('year', l(:label_year)) %>
 <%= select_year(@year, :prefix => "year", :discard_type => true) %>
 
 <%= link_to_remote l(:button_apply), 
diff --git a/app/views/queries/_filters.rhtml b/app/views/queries/_filters.rhtml
index b25cd01a..58ea1524 100644
--- a/app/views/queries/_filters.rhtml
+++ b/app/views/queries/_filters.rhtml
@@ -94,7 +94,7 @@ function toggle_multi_select(field) {
 </table>
 </td>
 <td class="add-filter">
-<%= l(:label_filter_add) %>:
+<%= label_tag('add_filter_select', l(:label_filter_add)) %>:
 <%= select_tag 'add_filter_select', options_for_select([["",""]] + query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.collect{|field| [ field[1][:name] || l(("field_"+field[0].to_s.gsub(/_id$/, "")).to_sym), field[0]] unless query.has_filter?(field[0])}.compact),
 																		:onchange => "add_filter();",
 																		:class => "select-small",